xend: pass-through Use pci_dict_to_bdf_str() in hvm_pci_device_create()
authorKeir Fraser <keir.fraser@citrix.com>
Wed, 29 Jul 2009 08:19:13 +0000 (09:19 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Wed, 29 Jul 2009 08:19:13 +0000 (09:19 +0100)
* Use pci_dict_to_bdf_str() in hvm_pci_device_create()
* Use pci_name instead of pci_str in error message, pci_str does not
* exist

Signed-off-by: Simon Horman <horms@verge.net.au>
Acked-by: Dexuan Cui <dexuan.cui@intel.com>
tools/python/xen/xend/XendDomainInfo.py

index 7742410a9320f273f4d502914cda044d03d5506d..b505a3d86ebee4eb6f0300f67eeec7b5bb85d72e 100644 (file)
@@ -679,14 +679,10 @@ class XendDomainInfo:
                     raise VmError("device is already inserted")
 
         # Test whether the devices can be assigned with VT-d
-        pci_name = '%04x:%02x:%02x.%x' % \
-          (parse_hex(new_dev['domain']),\
-           parse_hex(new_dev['bus']),\
-           parse_hex(new_dev['slot']),\
-           parse_hex(new_dev['func']))
+        pci_name = pci_dict_to_bdf_str(new_dev)
         if pci_name in get_all_assigned_pci_devices():
             raise VmError("failed to assign device %s that has"
-                          " already been assigned to other domain." % pci_str)
+                          " already been assigned to other domain." % pci_name)
 
         # Here, we duplicate some checkings (in some cases, we mustn't allow
         # a device to be hot-plugged into an HVM guest) that are also done in